Rollup of 5 pull requests #116376

matthiaskrgr · 2023-10-03T10:24:14Z

Successful merges:

Add check_unused_messages in tidy #115863 (Add check_unused_messages in tidy)
Ensure that ~const trait bounds on associated functions are in const traits or impls #116210 (Ensure that ~const trait bounds on associated functions are in const traits or impls)
Rename both of the Match relations #116358 (Rename both of the Match relations)
Remove unused features from rustc_llvm. #116371 (Remove unused features from rustc_llvm.)
Print normalized ty #116374 (Print normalized ty)

r? @ghost
@rustbot modify labels: rollup

@fee1-dead

Previously, any associated function could have `~const` trait bounds on generic parameters, which could lead to ICEs when these bounds were used on associated functions of non-`#[const_trait] trait` or non-`impl const` blocks. Includes changes as per @fee1-dead's comments in rust-lang#116210.

…-check, r=davidtwco Add check_unused_messages in tidy From rust-lang#115728 (comment) The check is not 100% accurate, I guess it's enough for now.

Ensure that `~const` trait bounds on associated functions are in const traits or impls Zulip discussion: https://rust-lang.zulipchat.com/#narrow/stream/146212-t-compiler.2Fconst-eval/topic/How.20to.2Fshould.20I.20try.20to.20pinpoint.20ICEs.20related.20to.20effects.3F

Rename both of the `Match` relations Both of these names kinda were ambiguous. r? lcnr

Remove unused features from `rustc_llvm`. r? `@bjorn3`

Print normalized ty Inside `mir_assign_valid_types` we are comparing normalized type of `mir_place` but in debug message we are not printing the normalized value, this changes that.

matthiaskrgr · 2023-10-03T10:24:28Z

@bors r+ rollup=never p=5

bors · 2023-10-03T10:24:30Z

📌 Commit 7ba6498 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-03T11:49:09Z

⌛ Testing commit 7ba6498 with merge e3c631b...

bors · 2023-10-03T14:00:54Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing e3c631b to master...

rust-timer · 2023-10-03T14:02:23Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#115863	Add check_unused_messages in tidy	`007d7f46a666c2bb50f11a98a957214285b19348` (link)
#116210	Ensure that `~const` trait bounds on associated functions a…	`bf7d3b9f69bea5020e3fddc952d8d81b53e22b02` (link)
#116358	Rename both of the `Match` relations	`6d122dc7f1d646358897a66a217d30a66d543daa` (link)
#116371	Remove unused features from `rustc_llvm`.	`6d16bff56181f5d66b3dbb4e9cc2680782cc5b12` (link)
#116374	Print normalized ty	`9f17998edfbb781a98e804fed8551aeef3fda3e2` (link)

previous master: eb0f3ed59c

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-03T15:22:31Z

Finished benchmarking commit (e3c631b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.7%	[-0.8%, -0.5%]	3
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 620.328s -> 620.955s (0.10%)
Artifact size: 272.00 MiB -> 271.99 MiB (-0.00%)

chenyukang and others added 10 commits September 20, 2023 19:09

Cleanup unused messages in ftl files

42a033a

Rename both of the Match relations

2ffaeb5

Remove unused features from rustc_llvm.

c3127d1

print normalized ty

42c39b3

Rollup merge of rust-lang#115863 - chenyukang:yukang-add-message-tidy…

144862e

…-check, r=davidtwco Add check_unused_messages in tidy From rust-lang#115728 (comment) The check is not 100% accurate, I guess it's enough for now.

Rollup merge of rust-lang#116358 - compiler-errors:match, r=lcnr

12e4c78

Rename both of the `Match` relations Both of these names kinda were ambiguous. r? lcnr

Rollup merge of rust-lang#116371 - nnethercote:rustc_llvm, r=bjorn3

8e148a1

Remove unused features from `rustc_llvm`. r? `@bjorn3`

Rollup merge of rust-lang#116374 - ouz-a:correct_message, r=RalfJung

7ba6498

Print normalized ty Inside `mir_assign_valid_types` we are comparing normalized type of `mir_place` but in debug message we are not printing the normalized value, this changes that.

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2023

bors merged commit e3c631b into rust-lang:master Oct 3, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 3, 2023

bors mentioned this pull request Oct 3, 2023

Prepare removal of auto trait syntax in favor of new attribute #[rustc_auto_trait] #116126

Closed

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

matthiaskrgr deleted the rollup-b3d14gq branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #116376

Rollup of 5 pull requests #116376

matthiaskrgr commented Oct 3, 2023

matthiaskrgr commented Oct 3, 2023

bors commented Oct 3, 2023

bors commented Oct 3, 2023

bors commented Oct 3, 2023

rust-timer commented Oct 3, 2023

rust-timer commented Oct 3, 2023

Rollup of 5 pull requests #116376

Rollup of 5 pull requests #116376

Conversation

matthiaskrgr commented Oct 3, 2023

matthiaskrgr commented Oct 3, 2023

bors commented Oct 3, 2023

bors commented Oct 3, 2023

bors commented Oct 3, 2023

rust-timer commented Oct 3, 2023

rust-timer commented Oct 3, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size